From: Joakim Verona <joakim@verona.se>
Date: Thu, 22 Jan 2015 23:13:27 +0000 (+0100)
Subject: Merge branch 'master' into xwidget
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~3394
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=bdd672b275034e8c1c65992f2e21dac7cc6eba60;p=emacs.git

Merge branch 'master' into xwidget
---

bdd672b275034e8c1c65992f2e21dac7cc6eba60